nio1 refactored - one step closer to ideal