not working, middle of changes