Went back to Evan's implementation.