Update again..

Added constants and comments