renamed class, adjusted dates, shortened det calculation