added non-admin working prototype