incorperated some of the changes aasted suggested