Updated jaycanuck lib