updated changes from ivan