Minor Lang modification and added forgotten or-part