commit after working, a lot of things were done...