Santiago's JS changes