fixed and working :D