removed stuff so it is usable as standalone package