all changes from test ubuntu, works correct