With change encoding and remove the extra code