stas patch
my changes