replaced abitrary values with DEFINED values
commiting minor revisions