fine tuning 5-3-1 and admin logic