mark feature experimental and bit more descriptive