Removed the extra code and changed the encoding