Work item

I'm asking about line 55 ////////////////////////////////////////////////////// it's unnecessary I guess.