lines removing here needfix