Nice Night commit 2