Rework to address own issues.