added whayler1's update