Final - Fixed Bugs