Mpabyrivska

Please review my changes: @rmkown 
Please remove all commented code