organized, removed opts, re-instated modified