Uploaded last changes on v3