various modifications per 6/25 meeting