Put back the hacky conditionals, to test them out.