Finished JS part 2