integrate negars work
cleanup