Updated with Javascript includes