Change goodnight to new requirements