need to make a few more changes