Updated to enhanced matrix