modify for fluent use