Adds better logic of endate but requires refactoring.