Got it to match the previous versoin exactly