Massive upgrade for backwards campatible.