Ditto on both of your suggestions.