changed some syntax and added the 'must be wrap' pattern