Updated to 1.15, plus changes