Updated - @thbishop what do you think? Better?