No more shenanigans?