Added more outputs