still not working, done some commenting