working everythings fix