Moved clay's changes