Finished the js