added my name
merge sid/spencer