A system, method and computer program product, the method includes: locating within a media stream video of interest that starts at a random access point and ends at a packet associated with timing information that corresponds to a decoding time stamp of the random access point; modifying the video of interest to provide modified video of interest; wherein the modifying comprises modifying timing information associated with a beginning of the random access point to reflect a difference between the decoding time stamp and a transmission duration of the modified video of interest to a user; receiving a request, from the user, to perform a channel change and start receiving a channel that comprises the modified video of interest; and transmitting to the user the modified video of interest.