Some adaption