removed backwards compatibility hack
new libs