updated for fireflies