Make this stuff backward compatible. Force the order of execution.