Added crypto and p