a Lot of changes in .js