Reverting to old style design