some adaptions