All this accept methods is going to die on next PR... but changing anyway =)