Wow, somehow I overlooked those new fields above...