bringing up to current working model