had some reworking for cancelling sessions