Final Changes For Model