Added return value
Removed fluent