Switched over to using output class.