Completed all last changes. Some changes on server.