Restored the old way