model changes as suggested by jan e