FIXED and WORKING

With lots of updates