removed unuseful self
completed parametrization