added tomsons26s changes