more 2.1 stuff