updating to follow mbaxter's advice