added changes per ops-234 and renamed the check