Version 2.2 - Tested with matrix