seperated functions
Merge branch 'develop' of https://github.com/DarkFalconQS/homequakehub into develop