small changes ( still not working )