add kick and changed some