Made wrapping in figure optional