Adding #39, #40