Incorporating feedbacks from @jferris