changed some default behavior code