Re-add matlab stuff