tweaked the passing of parameters