Try to bring this to the modern age