edwards: speed improvement