@edmorrissey did I get it right?