Move new addfd() up