change uses of base to blocks