adding stuff back in cuz of gitinsanity merge