Added End/Else Lazy