Updates based on Vytautas feedback.