Trying to make it more like CSP