last changes..it works