adjusted to work with new Spock and Spock-auth