Parameterized, minor refactoring if i remember right ...