moved over a few things I missed