Reverted Curtis's changes