added set
more set
rearranged elements
added cleanup