Pulled in Galland changes, check description below