re-organized and clarified