Address sethladd's comments