Temporarily added Mike's changes so he can see them on the real data