ugly order hack attempt # 2