further adaptions