Fixed bug and added new model