Changes from pjvoltron