style changes and model changes