Pass everything along correctly