update to be more fluent