switched back to old scheme