use recent syntax when we can