stipped some more stuff out