Do that last thins again, but properly