fixing stuff 2/2 for Web
one by one sir?