update
code cleanup
added back accidentally deleted code