reverted to vanilla tannhauser code