removed redundancy, specific ws handler