Some changes before we start mp4