Updated final stage + JS