Updated functionality for datenight