got changes in functionality from webgui