JS tested and working now