Updated to work with an upcoming update