Added ways splitting