Re-added adam's stuff again