Added logic for assignment goals.