Updates for Firefly