add more exp features
removed experimental features for the moment