so much work, need to commit more frequently