Removed all the fluent stuff and added bounds.