work
Refactoring new web functions