kick and code changes