Add terrible class back