Update
Don't use alert!!!!
Merge branch 'Refactor' into develop