added jonalf stuff