added timestamp and folder location