replaced np.pi with PI and merged