integratedinto wrapper and fixed things