Cherry pick Oleg's words