snapshot of 3.3.1