Changed Logic for Web