updated model to get rid of extra fields