started another refactoring - never ending story :-(