7/31 working model with test