major update consolidate JS