Update 370

Based off of jyeary90's commit 030790edf9a45c10b52d17d7bed9c535a924fd72

Runs too slow.