debugged last changes