made a couple of changes