updates based on 10/24 dev call #12