some fundamental changes which seems not to affect anything else!!!!