added Shiffman suggestions not really working