Rewrite for 4.0 - might still need review
-b is redundant
4.0 rewrite