Fixing issues with ip sync
merge..?