added bill's changes