Fixed Wrapper and removed abordted tool