updated by chris c?