more changes..