added 3.4 stuff