changes to fix review comments