updated with the recent fluent API