@eillarra, does this look good to you?