Misc Changes 1