not used any more
refactored / cleaned up