added everything else for new app