last commit before changing model structure