working on commit fix