Cleaned up changes made for Chris and Mark