still not working completely