Perfomance upgrades, and made code clean, still won't work :P