added header, tweaked names