UPDATE - Fixed Codes