Update based on ebidel's comments