More analysis work