Updated from review