Changes made by Markos Yeterawork (yeteraworkm@primesource.com).