Major style changes, modified order steps