Major updates for web based version