Entertain tweak

@Entertain-tweak