FInished conversion on spring user all, project all, rspt only add.