Commit by Stas