Making it fully generic - forgot one more variable