sync
bugs resolved