Addressed Oleg's feedback