added matrix-project support part 2