Made it so extra parameters can be passed