Did some renaming and added Matrix