further work on Hector support