few changes on model