Change setup and add new js