removed ids and changed order