not sure about this commit
Working clue function