version 1 : changes App class