Added more rejection packets, revised some logic