Changes for #12, add second param for accept method