addressed @paulromano comments