What's a better way to handle this? - Filament