DF-3527 layers rearranged