demo with refactored figures