Reworked for web interface