Update to use the new rendering conditionals