last changes(some errors added)