Added more changes to app