Updates based on Dmitriy's comments