incorporate some of spike's stuff