move things around again to make directive vals make more sense