added some experimental features