original merged with north's; naming; cleanup