changes to follow links requesting in #560