merge changes by seahawk1986