Including Dustin's changes for block/unblock features