updated 2d pa... think it works