Incoirporated review comments