Commit form windows
commit
Conflict solved
NFA test passed successfully but need to edit Simpson's classes
NFA test passed