updates to working model