improved delivery options and mechanism