Added stop time information; unfinished