hw2 changed param structure