Still incomplete - JS updates