Minor changes....umm yeah...