End conditions and EndScreen added