Added matrix limit feature