Removed unnecissary code, tied in new special blocks