some cleanup on 11
new approach needed - this didn't work