Update enrollment process script, still pending improvements