Change the instanciation, hopefully for better maybe for worse,