Added new nightwatch