small modificaions