Incorporated feedback from Alexey.