To be completed after discussions in Aug 2