Optional else added