added criterion handling