work on eliminating double calls