Slight changes to my analysis after some tests.