im starting to think na1 will never get merged