updated to used the newest Spock