NIGHTBELL: Update

Some improvements have been made