updated limit check
merge