commenting out erronous parts
merge