More changes to kick. Not working yet.