Remaking of the app and changing some functions