broken
added descriptor support