LL: Changes after merge