Cleaned up kerfuffle from before