Updated anticipatory table
Cleaner code