modifications according to previous commit