Reverting back to old code