change & fix codes