Incorporated edits from minoru matsui