restructuring the whole thing... just make simple things no soo complicated as before...
should be working fine now