added last changes in current version