added some statics and some other stuff