putting back some unnecessary changes pointed out by owner