i did somethings but i need to commit because iOS