Improved last section