Adding Jarkko stuff