should be working...
Constants added.
beta 0404
beta 0404