Adding deckard01 suggested changes