Fix bug and assigned date functionality