Updated code to set from new html