Moving blocks as per Jon's recommendations