r2215 - finally stick with dragons