This is the real push of the changes Anh and Luke made