bunch of changes..