Added Alex's code into app