Moving blocks around for consistency