refactoring, prepare to Robux-NOC