Changed to support cancel access and tested