1.18 Changes