various changes for movie_mode