few changes 1