Changes to helpers and added admin_change (unfinished)