added teeler to rebased master