Updated from review comments