Should now work when multiple projects used