Update to make it work 3 years later