xxx
fixes and renaming
not working, but at right place