Added automated version in WHOLE