Updated source for standard analysis