small mod make it cleaner where the sync happens