replaced 'date' with 'self.date'