Initial review and changes