added date address input
fixed merge conflict