changed some of the outputHandler stuff