model & db fixed