Organize better
Everything works! (i think)