Adding suggestions from @jdm