review comments implemented