After changes from analysis on 04/25