Address daryl comments