Previous implementation broke on dashboard