More hw-3 wip