Nice Night commit 1