deleted commented out code
changed order of dates