fix of requested changes