fixed review comments by Kay