Added features from Stanford paper