Nice Night commit 3