Added and Fixed Codes