updates as pointed out by Cole Bitting