Fixed the outputs to more general.