Made compliant w/ Damgaard's advice