Version 6

Version after talking with Brad.