added all of Mike's stuff in one push