want to get dist in there as well