start to port back changes from ios