minor changes since last one -J