commented out new code which what when merged what did not which want work anymore