Even better logic for football tables