wip upgrading bunny to 1.6