Removed fr, changed method for picking date