@Diapolo and @petertodd Suggestions.