mapping features
merged 0.1