now working for the web
hopefully merged