removed stuff, made generic