syncing and commit after rico's changes