Revised JS scaffold