merged a few lines