more improvements
sync