added some stuff in App.jav