started working on new fix code