refactored/revised asset management & options