merge into ari's ucla stuff
get rid of new line and reformat
merge ucla change