changed comment order