some adaptions that popped up during work