Fixing hw01 and hw02