Andrews planning big water upgrades