changed parameters to match UML