finished fixing pa1