Updates towards fixing iProject1