switched to movie data and tidied up