minor changes
Consolidated finished