fixed few changes