Refactor, added photos