parametise some more stuff