Pre bulk/quick handling rewrite