Modifications per WA review