Changes from jhanson