Needed changes for more blocks and stuff like that.