catch up to 1.8 updates