finished pa1
added pa2