Lst changes before merge