changes according to comments..