updated to use new armory functions