merge #4 - players controller