few changes..