Bayswater upgrade plan focuses on management of coal ash and water