passing last test and fixing some isses with doubling up calls