More structutal changes to cdnlysis