Started better iching implementation