removed clay's changes