closed issue 5, amended issue 2 as a result