simplified some code and added excerpts