Removed OI's Magic #'s