Near-final plan for the new aquarium setup