still trying to fix bugs in the new model