Ninjaed some changes in.