accept logic fixes