NOT WORKING, added all code