change from greg for dead lock