edited over weekend 4/1