Implemented sync and better UX