first draft update
cleaning up code
update