Contact partially finished, need to be improved