Updated check subfunction calls