cleaned up  for various states