Overhaul of the offense is not yet complete