small modifications and fia look at comment line 703