Updated 6.15.18

Updated 6.15.18