addressed concerns by jeremyje