replaced define with wrap