More beams, water storage roof