now using modular api