Slight rework to keep classes flow the same.