Updated to version from the video demo