Building Grid, Fixes 35 Fixes 36