FIX: updates for pg 9