first_pull added & order fix