removed more lines