Mostly Up to date with 1.7