2nd attempt after modify models