So much cleaner than previous implementation! :fireworks: