Some updates
Tacking tested on simulator, works fine :)