working but not well
Trying commit all changes