Wrapper completed & tested; adjusted many systems