refactor block checking
merge