Updated default behavior so existing implementations aren't affected, also slightly changed behavior to match docs