Updated to lates versions