nil's changes; might compile now