Made updates as suggested by Furuya