Modified to remove extra method chaining