small changes
sync tested