fixed new TYPE() thing. hacky?