Removed need for a matrix