Adding more detail and some JavaScript calls