Added mapping for phi from 0 to 2Pi