implementing suggestions from yesturdays presentation