Changes made by Glen Souza (glenster75@gmail.com).