stuff for 3.3.1