more work on admin tables