Changes from Jeffs comp redo