Changed some code of browser part for feedback from client.