now using blocks, updated preferences