Changed to output everything