last changes (0.5)