corrected new analysis schema