small cahnges as per SM
move setup stuff outside of admin