first major revisions and setup