Cleaned up a little more for CJ to look at