joshua-smith98 Some changes to support looking for more heads in the future