Additions to #0df602e5d75b08f8be9d39f301df4ec4012c31cc