Good move away from hardcoding :ear: