Update to gh-6 (cleaner implementation, but not much)