movement of checking code, #115