Changes suggested by DarkSeraphim