Major performance changes.