Changes on ios and server side