still not working, added notes