Changes proposed by mbrant