Changed filename and updated SQL