Several changes to script and timeline