commits from esheldon