Adding Back JS and debug