added jon's stuff