More adaption

Only a little