hehe yeah that part also felt hacky to me, but I'm happy we found almost the same solution