1.6.1 stuff