added claytons changes