tidy up + added right-left censoring