Further adaptions.