Separated aspect feature from surface features, though that degraded performance a bit