added modal and timer