rewrote to match timelapse