Updated for new format (see HTML + JS)