made more modificaions