Before merging with Andrew's
After merge