fixing wip code