NOS-2 Refactoring
NOS-2 Refactoring