further adaptions..