modified EndSet layout