Issues #7, #37, #39