feedback implemented
date overlapping fixed