Updated 3.24.18

Updated 3.24.18