Updated doc and 3.3