Rik it looks like you have it figured out.