Few modifications and starting Wolff