yes, that works. Now I just have a few failing test cases that I need to check up on. But this certainly simplifies the code a lot.