Need to make a couple fixes