#81 more discrete