V4.0 Undoing all of the messyness