working on fixing commit