dev work to make more efficient