Leon - review comments