Updated for revised version of addon