Updating Matrix to work with changes to piece