Some more hacking stuff to get everything to work like it suppose