Update based on timthelion comments