udpated sync and refactored