updating constants and behavior methods

Change-Id: I0afd0a6607e260de0e4a54d32642ebe28751b22f