Improved last changes