few changes ....