Minor changes, semiworking wrapper