switch to new admin and modified db models