Minor changes... not working for some reason