New changes as expected by webdev

New changes as expected by webdev