#2 Misc Changes