Progress on fight collision on client part