Added Starbench code changes
Added Starbench code changes CLEAN