Fixy for dave's stuff