More word boundary calc