Updates for flo and add hammerhead