bunch of changes........