updated  model (but not final), working admin panel