some adaptions, not yet done.