Added figure wrapping