Improved populate algorithm and create new populateAndNormalise