more 3.3.1 suggestions