My version of the app without range detection