Reflect the comments by Susumu