new output + some fix