Tested, fixed and working