Structure Changes

Avoids "function undefined error"