commit done. second version