Added wrap and restored original width