Trying to properly bring in your changes