fixed issues and new model