JS restructured
Update