added joon's stuff