Added return date functionality