moved all changes back to the app-server js