Minor changes, final submission