How could I improve the setup?