going to pull from server. safety commit