3.3+stuff

3.3 stuff