merged with web interface