Removed subsref silliness, for speed