Bug fix and year/round pick