few changes in progress