Andriy's latest changes.