Update #15 and #20