made changes, probably not working