SUPPORT for different masses and small bug removed for l!=0