new version of figure management
velocity test