some minnor changes not relly working yet