Merged admin.py and public.py