change codes & fix