Final changes for ios