Added Randy's changes